Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 00:59:02 +0000 (17:59 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 21 Jun 2011 00:59:02 +0000 (17:59 -0700)
commit6c6734c23c0cdbcd38a76b611af32547d0d74b70
treed410eee770c0d10b40e337bd9cb35a4a47466947
parent90e7de2f54c793774c3afa570afa80a95245eac6
parentb1db12ce3be7362656c83f24c2a0c70ae9541490
Merge from trunk.
src/ChangeLog
src/fns.c
src/process.c
src/xdisp.c